Updated version 3.6.2 from 'upstream/3.6.2'
authorGert Wollny <gewo@debian.org>
Wed, 2 Aug 2017 15:13:14 +0000 (15:13 +0000)
committerGert Wollny <gewo@debian.org>
Wed, 2 Aug 2017 15:13:14 +0000 (15:13 +0000)
with Debian dir 71b1d69e7b3011c2fbea9182243abf869c484e4f


Trivial merge